Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Mon, 29 Aug 2005 22:31:51 +0000 (15:31 -0700)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Mon, 29 Aug 2005 22:31:51 +0000 (15:31 -0700)

Trivial merge